Multi-arch it; Add libopencc-dbg package; Bump standard version to 3.9.3; Add YunQian...

diff --git a/debian/changelog b/debian/changelog
index c53767d9c30918bb84d8cba8eb4c52d08cda86b2..3027f42b4d21a686a2096e133971fc73c40e4c8a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+opencc (0.3.0-2) unstable; urgency=low
+
+  * Multi-arch it.
+  * Add libopencc-dbg package.
+  * Bump standard version to 3.9.3.
+  * Add YunQiang Su to Uploaders.
+
+ -- YunQiang Su <wzssyqa@gmail.com>  Thu, 29 Mar 2012 03:22:51 +0800
+
 opencc (0.3.0-1) unstable; urgency=low
 
   * Team upload.

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index 57e3303717c8dacb4516a12c6f9b3a5d41a8ed52..a3307373d57bdce4680949d624df288b7f9d4ea6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
 Source: opencc
 Priority: optional
 Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org> 
-Uploaders: LI Daobing <lidaobing@debian.org>, Asias He <asias.hejun@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1.1~), cmake
-Standards-Version: 3.9.2
+Uploaders: LI Daobing <lidaobing@debian.org>, Asias He <asias.hejun@gmail.com>,
+               YunQiang Su <wzssyqa@gmail.com>
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1~), cmake
+Standards-Version: 3.9.3
 Section: libs
 Homepage: http://code.google.com/p/opencc
 Vcs-Git: git://git.debian.org/git/pkg-ime/opencc.git
@@ -21,8 +22,9 @@ Description: simplified-traditional chinese conversion tool
  This package includes the conversion tool.
 
 Package: libopencc1
-Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libopencc0
 Conflicts: libopencc0
@@ -41,3 +43,14 @@ Description: simplified-traditional chinese conversion library - development
  simplified chinese. 
  .
  This package includes the development support files.
+
+Package: libopencc-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libopencc1 (= ${binary:Version}), ${misc:Depends}
+Description: simplified-traditional chinese conversion library - debug
+ opencc is a library for converting character between traditional chinese and
+ simplified chinese.
+ .
+ This package includes the debug symbols which is useful when debug.

diff --git a/debian/libopencc-dev.install b/debian/libopencc-dev.install
index 6cd8ddd2b3973b0b46c120482ca433966ab5ca64..76f28fa26af68d3f4813e69b6ad2a762f07913de 100644 (file)
--- a/debian/libopencc-dev.install
+++ b/debian/libopencc-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*

diff --git a/debian/libopencc1.install b/debian/libopencc1.install
index 30186ac4a7cc1921fe629a75db3878edb0d69600..f4191f2d4815175b4b07a62559811c62079185f5 100644 (file)
--- a/debian/libopencc1.install
+++ b/debian/libopencc1.install
@@ -1,3 +1,3 @@
-usr/lib/lib*.so.*
-usr/share/opencc/*
+usr/lib/*/lib*.so.*
+usr/lib/*/opencc/*
 usr/share/locale/*

diff --git a/debian/patches/fix-new-test-cases.patch b/debian/patches/fix-new-test-cases.patch
index c9c73dea695a958e8496b5a208906c8fbd6254ea..5d9339ec4cb92257e53b1224de9fdecd5c87aee5 100644 (file)
--- a/debian/patches/fix-new-test-cases.patch
+++ b/debian/patches/fix-new-test-cases.patch
@@ -1,9 +1,12 @@
-Description: Fix new test cases
+Description: Fix new test cases, install data file to meet need of multi-arch
  Copy nedded dict files to ${PROJECT_BINARY_DIR}/data for tests.
-Author: Kan-Ru Chen <koster@debian.org>
+ Install data files to ${DIR_LIBRARY} instead of ${DIR_SHARE}
+Author: Kan-Ru Chen <koster@debian.org>, YunQiang Su <wzssyqa@gmail.com>
 
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
+Index: opencc/data/CMakeLists.txt
+===================================================================
+--- opencc.orig/data/CMakeLists.txt    2012-03-29 01:56:20.043932047 +0800
++++ opencc/data/CMakeLists.txt 2012-03-29 03:16:12.183694991 +0800
 @@ -92,4 +92,10 @@
                ${CHINA_DICT_FILES}
        DESTINATION
@@ -17,8 +20,10 @@ Author: Kan-Ru Chen <koster@debian.org>
 +              configure_file(${DICT} ${PROJECT_BINARY_DIR}/data COPYONLY)
 +      endforeach (DICT)
 +endif (BUILD_TESTING)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+Index: opencc/CMakeLists.txt
+===================================================================
+--- opencc.orig/CMakeLists.txt 2012-03-29 01:56:20.043932047 +0800
++++ opencc/CMakeLists.txt      2012-03-29 03:16:34.919807728 +0800
 @@ -20,6 +20,7 @@
  cmake_minimum_required(VERSION 2.8)
  set (PACKAGE_NAME opencc)
@@ -27,3 +32,12 @@ Author: Kan-Ru Chen <koster@debian.org>
  enable_testing()
  
  ######## Package information
+@@ -86,7 +87,7 @@
+       set (DIR_ETC ${SYSCONF_INSTALL_DIR})
+ endif (DEFINED SYSCONF_INSTALL_DIR)
+ 
+-set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc)
++set (DIR_SHARE_OPENCC ${DIR_LIBRARY}/opencc)
+ set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
+ 
+ ######## Configuration

diff --git a/debian/rules b/debian/rules
index 75ecb9ad332f56a1c16247320766d4db6e282b64..69a6c8a4a5cd87d490adac29d6456c16f0e825bd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,18 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
        dh  $@
 
 override_dh_auto_configure:
-       dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT:BOOL=ON
+       dh_auto_configure -- \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DCMAKE_INSTALL_LIBDIR=/usr/lib/${DEB_HOST_MULTIARCH}/ \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DENABLE_GETTEXT:BOOL=ON
+
+override_dh_strip:
+       dh_strip -plibopencc1 --dbg-package=libopencc-dbg
+       dh_strip